Renamed, reorged per discussion with pbelanger