everything working nicer