calls for log_info should really be debug
merge commit (because of whitespace)