Last part of new changes