Fixed logs
Merge branch 'd2'