some changes as usual