I did the very same thing a few years ago with a police trade-in 17. They even gave me all new mags. (I had shown up with three mags). They aso asked if I wanted to upgrade to extended mag release and slide catch. So, I said sure. 20 minutes later I was holding my gun again, still warm from function testing.