improved parameter types concistency huhuhu