Code update and README update