fixed and tested dirac structure