last updates before class