Enhanced the enhancements

Closes issue #14