added tags and other stuff