Diffed code with onw and pulled in changes that were missed