Dev

Completely fix the cputime problem!