Added 2-D Case