Added shields.
Improved data to client.