ticket:2 Added logs and comments