change userId to currentUser