re-write to match -import v0.2.0