get rid of snapshot dependency