Add suggestions from kmugrage