JB-part2 before cleanup