small nitty gritty work
fixed conflict: two edits introduced the same change