Wait until area finished to shift

Changed area_shift to wait until an area is completed to shift it