Merge "Added some logging"