Minor changes i think