new changes for testing and such