renaming vars
Add citizen views