Working on 3D, now works quite well