Queue update and zaxis shutdown order change