Added overides and corrected super