More ajustments of the latest commit