Mostly converted to newer 10.1 version