Re-worked behaviour to be fault tolerant