added matching for multiple arguments. -James & John