changes from RJs comments