ray's modify to feature_002