smoke test 28 June 2 - edit