added tags into the functions