Added check, some admin changes