all that refactor and now passing the CI