Adjusted scenes, added goals