made some changes localy on master