Modification for Harbour acceptance... (again...)