updated all last changes