made some changes: master