Actually modified Gpp.scala