Still issues with timing