Added Admin Check + redueced memory usage