Prepared code for VIP review
VIP changes. Round 1
"VIP changes push 1."