ticket:3 enhancements according to comments