TO DO: Fix collision issues when changing lanes