changed input args to be more effective