added condition for current user