added admin functions
merge changes
complete merger