commented the changes I made client-side