changed argument processing