Mauser c96 stock

Hello!
This is model of mauser c96 stock-holster.
The main problem with it is the fact that you have to keep your gun on safety to actualy close this stock, but original model hasn't got a working safety. Based on this i need redesigned some details and make it work as it should.
Second problem connected with locking mechanism - it is completely different from original.