Reworked time positioning.