Just tested and commented the changes