Some inner changes