updating changes lost in merge
adding back in partials lost in merger