Make this less bad