Updated timing and kind of works