added waiting animation sync
fixed code conflicts