JC remodeling

 ccb#213644