some minor changes2