a few more intermediate changes