lots fo changes