Time accounting fix; timeout change to 10s
New XPI