added argument capture support. -James & Jamie