Custom version: survival compatible