Added collision event conditions and ui