updates to match 2.0.2 spec