change over stuff to new arguments format