advanced Stentiford + add timing