- changes in logging
 - refactoring