Updated, and prior to Jurek's feedback