Made improvements

Made improvements