-some enhancements