added enhancements up to number 18