some changes from Ben