O section added + some fix on N section