Update with Enhancements/refinements