work version with new gui
work version with new gui