some changes in Scanner