Finalized Version
Fix'd