Updated calculs, values are a little bit down.