re-factor gnome.