added some of the overrides