tag now works, it simplifies lots of things
delete some code