Final changes before class