Finished Just mad some changes.