JR1000 logic error
JR1000 logic update