Changes are mainly results of code debugging :)