some remake admin and comments