Timer working
fixed conflicts