Dramatically simplified and sped up prompt

...amongst other changes