intermediate test version (not working well)
v0.13pre4 ready?