Added callback for zero hour
fixed conflicts