Added better collision calculations