Argument processing
Source changed to 1.6