Removed need for inserting tags