current user detection added.