Added timer (should help with merge conflicts)