COntinue refactor