some organizing; onbuild working!