fixed update schedule
fixed updating
merged changes