Added 2d shape functions