remove old classes, add additional params