Added log everywhere