I did the same in my TOZ 17. Because it was designed as a cadet rifle they gave it the standard 2 stage trigger. Shim under the spring, be careful it takes a bit of testing to get the exact thickness. A small elastic around the trigger and the block just enough to take up the slack in the trigger, been keeping a look out for a spring that would do the trick but haven’t found one.