Altered to include a key suffix as recommended by Noel