3D-World commit 2