Final demo wave adjusments