Some major changes coming part 2