adread refactors