changed routines classes