Added until times to manual class selector