Added fail and always events