Updated to Yiistrap