Completed Modification of Gii Generator to work with our project