Various changes
Don’t know what happened here