Took Jul`s changes