This is the first commit, in the next one I would change the feature