Moved some stuff out, new timings