REFACTORING contracts and some more