Attempting to add logging back