added tags, etc