made some changes not fixed yet