Added $self as eventual replacement for $this