changed according to spec v2