Updated preen and overrides