#26 added some logging