Attempt to fixed matrix offset issues
Fixed conflicts