more fixing of Josh's jacked up copy