slightly better class management