Reworked ready logic to use the client callback data.
merged master