work done
Improvements
Merged dev-CINT-212-fixture-model