Little changes on initializing