Updated toy analysis