[Comments]: some changes in progress...