Conservative; reintroduce features omitted recently