Changed arguments from the script over to kwargs