Sonia - Completed client side logic