Last commit before being working on 3d implementation.