latest changes from controller and gui side.