changes to re-enable logging