added some minor changes