implemeted new changes