Added cross checks