Moved some code (v0.1.5.a22)