Made some updates

Made some updates