Updated with Sandy's second round of suggestions