Added name parameter for non-members too!