DON'T SHOOT US: Update 0.2

*Optimization