some changes... #1