@gklopper  this is already being done further down in the file Line 39.