refactor and added additional sauce run flags