XS gadri proposal And's version