being more minimal with my changes