Reworked a few scenes + going outside
sorting