Minor update- Separated client side from server