Pin version

I think this is probably safe
Break out into separate method