changed name, cleaned up tags