adding more seb and refactor