There is definitely some room for improvement. Its actually a bit easier to cock without the barrel and tank on it (you can easily do it one handed). Kind of counter intuitive. Some slight improvements are in the works but I think I will start over with a new gun. I still want to try thumb lever on this one though and a 4grip.