Modified argument handler, UNSTABLE