Gui commit

accidentally committed to Eric's branch before.