2D was implemented and tested