Chris - Added code which was removed before by me.