all active class functionality seems to be working now