Added the new modification story for checking clashes. Fix #56