Updated to include a variations on admin i/f
Final version