Added t_first requirement, maybe other minor changes