more sane build architecture