Small alterations (shh, I don't remember)