some changes like