use currentUser insteadof hand made function
modified