some changes for GUI