8 Commits (feature/contract_update)