Removed .self references. Fixed infite recursion