Creation of catch points now implemented
Reformatting