Version Change
Rewrote Modal view