updated and made changes