code clean up
Implemented Multi-Shot