Simplify logic
Pin down version for now

See #82