Finish addTag function. Remenber, keep simple !