Big update part1