First go at updating the time machine