Update to properly use the user provided