@peterloron: Why not keep