Changed nil to null
Changed self to this