Added more logginh