update annotations
update isModerator check