[Water 002] update new stamp improvement