replaced conditional parameter method