fixed
wait for update
together