Homework-2 client side improved.