Hayoo schema corrected