Almost working with new changes