Updating logs to make it faster and cleaner