some tweeks to get the classes right