Further iterations of modifications, additional logging.