8th Revision. Fixing Gui code.