changed to refer to self