Updated with logging info.