Diona/borer features, stuff from master.