Another big update #2
Fix conflicts