major Changes

Made some major changes