implemented new changes
implemented new changes