with modify option and enhancements