timeline fix, code wrapper fix