Finished Up New Code