add two other tags and remove unused code