some changes by Vaios