Updated. full test_data r=0.3829, sub1