Added checks for user signed in?