new version almost ready. just last test fix!