fixed Overrides and updated references