Actually made the last changes work properly