Finalized v.1.1 + Finished adding enhancement #7