some changes hehe