Some changes
collision resolution