update lot of changes