Added modify_sp flag