Some recommended changes