move more overrides to the gem