working version plus build