Some example enhancements and stuff