Reworked all of the time