Add new logic for GUI