1.2.3 Build 1

Added back improved survival functionalities introduced in 1.2.1 (not fully finished yet)