Little changes and upgrade on code