Made some Major Changes
Changes