re-write arguments