made some progress, but given up, applying changes seperately now