Address Mayank's comment