Finished modifying other files to work with new tag format