adding additional classes
reordering class hierachies
few changes