Going back to snapshot version for now