Updated to pass through a blank ID