removed extras. added some tags