Added the 2d array stuff from QC hack