Last changes
Merged