Changes to make my last changes work