Added a lot to MF; started Constraints