Feature/neba 22

#22 ready for peer review