Making Gabi's changes work