Added client-side stuff