fixed suo and ncb
temp commit