updated client side code parse