Updated for use with Gnome 3