Make epic hack less hacky