some re-org on the client side
some re-org on the client side..