Preparing to merge with Austin