seperate the classes into a better model