Updated arg parsing and new arguments to use