some changes to make it run