Feature/anti overlap

branch for #13