tweaking threasholds for Alex
resolving conflict