controller enhancements