Feature Enhancements / Revamp