Update to follow rules specified for assignment