I would leave the Diana well alone. The wife had 2 of the .177 carbines. They were a basket to cock, requiring even more effort than a gas ram. The trigger mechanism was appalling, I know people keep praising the T06, but the two I have experienced are far worse than the trigger on a 25D! They were way too light, too sensitive, basically hair triggers with no feel. Tried getting them adjusted. In the end the wife sold the rifles. They look good but are really not! She bought one, sold it, then decided to try spring guns again, bought another, found exactly the same problems, last Diana we bought and we will not buy another!

An HW95 or 99 will outshine it in trigger quality!