Added some comments, added block to failure