Added client-side code