more cites refactors...