Simplify, b/c I think its broken
Version bump