update look around
merge dev on update look around