Added some client-side logic