Added 2D capabilities