some changes in order to run