Made survival compatible