Couple of cool enhancements!