Ported to new version of Gabi