fixing overlap issues