updated for new gui