v0.6.0 working branch