Citizen

Copied from devel to citizen