make it work with the authenticated user instead of fake user