Pia's commit w/ new GUI