Even more progress in the waves front. With trimming!