final update for GUI 2.0