Added 2x2 setup