Vip edits (8/32)

Vip edits