switch back to add/removeClass functions for reliability