Eddited change for cleaning up collision