better collision, fixes in hierarchies