Client and Server script changes

-Steven