full solution updated
solution corrected