some changes [not important]