GUI update from Faraz