some minor changes!