new changes from aaron