Added changes to  Super.c