Should be a smooth upgrade from 0.3