#145 but with less helptext removed