[ENDX-507] ENDX-507