update to master (logging changes)