Attempted to fix time delays

WARNING: Not working as of writing.