Weilin's update for submission