updated for new citadel