minor changes and overrides