edited logging
merge