final updates before class