ticket:1 enhancements