Some Updates for collision wrappers need testing =)

Signed-off-by: Salja <salja8840@gmail.com>