Rebased with Master
Update contract rules