Address feedbacks from chandru