Updated to use recent libgee