Added IS24 logic