seperate classes and fixing tables