worked on timing issues