changed teh way how $super was implemented