Made shocker optional for installation
Prepared for better logging features