Final commit before class