some changes... again