Comments added - Ready for testing on Monday