make it work on 2.0.0
hack it up for osx