updating logging
fixing syntax error
manual merge