last changes

s