edits :bowtie:
Merge branch 'updating-users'