basic admin functions
min refactoring
refactoring 2