starting patching
manually merged