improved admin functions