Make epic hack even less hacky