improved agreement with mass and better timestamp