A few ajustements might be all we need..