Adding JM's suggestions