Added 3d support...experimental