almost done with enhancements