Jade rework, timstamp update