make everything working
it workds