Using the original jacobian for the constraint optimizer
Added slave and master files' changes