changes to GUI logic and discard