Updating new scenario, refactorings, and more. Done with my main man Tom