2D case partly finished