spare lloyd from noise on this branch; must revert this before merge