more code
moved build.functions