some enhancements made