Enhancements 2 complete