Half way done changes required for the Colestock-Kashuba case