final changes before class