Same rework applied to 2 more functions