updated to include user login