slight changes on logging