some new stuff and less brittle