2_5 solution polished according with mentor's comment