change imports back, fix version