tidied up parameter names
removed Connypatch