added rework and updated node modules