Lot of changes part 2