Integrated Jon's contiuum removal.