few line changes for scenarios and givens