XXX: more refactors