Update scripts and add overlap checker