Changes related to converting to GUI app