working on compatibility with 0.3 beta1