On branch dev-x-imp
 Changes to be committed: code reform.