Add second solution and improve specs