some changes to test SCLD-ATP locally... very weird results today...