re-added a couple of changes I missed out of conflict resolving