Make it closer to spec