working on weighting
Merging features/constraint into release.