updated rim collision handling