Get rid of the first Shavarus conversation and have it play out via in-line dialogue.