Refactor
public scenario