Addressed major comment and partially the medium one.