working on timing issues