added waiting, complete, next tag functionality