some changes on base