Refactored with citizen auth