New commit

A few corrections
Revert "New commit"

This reverts commit a5f830300a3d7b1d129cc2c515dbb34b717d29de.
Revert "Revert "New commit""

This reverts commit 7a033ecf592e6b428a132a29e6cb52e19d7c877b.
Final commit

A few corrections