Fixed timing - was wayyy off before