Approaching to final version
Final version for the moment