moving code to overrides