merged master on manipulate