correction and addition of new features update 1