more enhancements yay