added new files for make_watertight