[ENDX-508] ENDX-508