lets try that again, plus cleanup