convert to reusable object
adjust call
convert to new format