Save changes before merge with lior pull request
Confliced solved after merge with lior