Finish beta version of queue