Updated settings and added Calculated Lot Base