added tags/moved them around