some minor changes 2