More Work

Made some changes