Broke up my super method