include nick's change