Version Change
Rewrote code