Adding last changes
new updates