admin feature tweaked