submitting some enhancements