New tag input finalized
Merge branch 'Katlyn'