Added client2, citadel2