updated to seperate the returned arguments to the target Fixes #8