added collision resolver system