Addded new tags but haven't tested, compiled ok