3rd re-build to get things right