Attempting to improve logging facilities..