Updates for manipulation part