Finished new changes