Dan changes for google IO