merging in new code to add logs to