Cray - fixed another race condition
Simplified the code
Added test for super user