Reworked the scenes