all changes for admin and normal and comments
merging vivian's State