revised working-ish copy