a whole bunch of changes to work with 2.0.0a2