added admin conditions / debugged