I believe I have one of those rifles lying on the floor of my room in pieces right now haha. I think you are right and it is apps2. I know at least the trigger is for sure cause that's what broke (it's plastic and needs replaced). If I were you I would just take the gun apart first. Check compression in the cylinder, clean the barrel, and make sure the hop up is working right. That should help you figure out what needs upgrading first and should improve your performance once you get it back together even without replacing things.