adding vbox changes, will branch soon