Schedule fix
Merge with server