made some changes so server can work