keep command as small as possible as per rationale in issue #8