Some Enhancements