update classes to be better