got rid of discontinuity, ready to validate with walker