Version 0.1.1, with diagnostics