Minor last minute attempts to fix - Mr. B