some minor changes 3