some changes... #2