Clean up / update of client driver.  Updating create function to deal w/ 4.18 behavior