Second GUI update, with the right stuff