compile in changes from vaughn