Note on/off structure rebased

+ will be improved further!