Enhancements 1-5 done