added and made changes