implemented the new changes