Adding @anandpdoshi's and @somo82's suggestions.