A lot of updates (mostly the 3D encoder that not ready)