time patch

with tons conflicts... lol