Adding JMs suggestions