minor re-jig