Draft of the solution (micro update)