improve fixtures