Updated time shenanigans