Few ajustments...