Little changes on base