20:10:15 Updated the files to reflect the discussion above