adding proper logging / 2