Merge in Dylan's updates