after refactoring all to logs
hopefully working