new simpler build