Last minute changes to make everything working ;)