A few changes to try to get this to work. partial check-in