JSPACE-86 Complete rework of crosswalk.