My changes for U2 Toolkit

My changes