changes to work with v0.3