A few creative enhancements