Changes for new gui