Address Mayank's comments