fixed overlaps -- DONE!