Updated

Made some more changes.