I just got the Beeman RS2 combo kit from wally world as well. I have put about 250 shots through her. I'm about to tear her down and do a debur and polishing job. I have never worked on a springer before but i have done tons of paintball gun trigger jobs. Has anyone attempted to modify this rifle to not click the safety on when it is cocked? I'm going to home depot to grab a clamp to build the spring compressor right now.