added Gui's suggestions