Updated source to use tag