Added Logger
Second draft