Partially updated the rules