messed with some policies but switching to new branch for a major change
fixed merge conflict