Small additions
Added admin check