attempt of merge of GUI to Master