1.4.3 - refactoring and add more debug logging