Multicore refactor to inside clusters matching