Made new enhancements