*final version update 1