license change and addition of collapsing code