Make things go fast

Change-Id: Ib849adbba5975fbfc4763fde140c6f01b739e23d