Adding those changes from client over