changed extends
some fixes