some changes to pass