some changes
last changes