Updated to sync with new manip.h