Updated for up.time 7