Update for plane waves rotation + Cicm Wrapper update
Update Vanilla and Extended