Updated Arguments and Debug Messages