reapply Alan's build file