Added code for adding this and super