some changes to cope with failure