Thru 16.6

Added movement also