#77 minor prep work