Code update

Code update, and resources update