Remade some collision calculations