pull request from jl6583(Jiayi Lu)

This is the pull requese from jl6583(Jiayi Lu)