dev::NLB-9::Not completed yet