Comments from muralihr

Enforcement needs to be