Started merging - improved safety for spawning