Re done most variables so more like pburgess originals