Added users and comments back in