changed tags to match front end