Implemented enhancements, #1 and #2