Refactor
temporarily comment out `topics`