Reverted the use of self on non object instnaces