transitions in place
soundwave effect
Merge branch 'effects'