Changes to the scene that were missing in the previous push are committed here