minor refac
build refac
refac
probes cont'd