Finished Testing and Updated base on Rebase Changes