change the modularisation for nub; better documentatioN