final commit, with GUI bug