logging added, renamed