YJ- finished isOK