finalised debugging noticed this morning (sorry)