add logs -> clean up