Better version of the solutions