updated custom classes