Changed $this to self