Refactor of advancing scenario