removed uneeded super wrapper